GL: Follow naming conventions

All the GDK type defines are GDK_TYPE_..., so follow this
pattern for the GLContext subclasses as well.

diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
index 60d4de7bf803b0542a8f802236c5022c411356aa..8894e8bc8160f0f050428606024edabf7f234476 100644 (file)
--- a/gdk/wayland/gdkglcontext-wayland.c
+++ b/gdk/wayland/gdkglcontext-wayland.c
@@ -357,7 +357,7 @@ gdk_wayland_window_create_gl_context (GdkWindow     *window,
   GDK_NOTE (OPENGL,
             g_print ("Created EGL context[%p]\n", ctx));
 
-  context = g_object_new (GDK_WAYLAND_TYPE_GL_CONTEXT,
+  context = g_object_new (GDK_TYPE_WAYLAND_GL_CONTEXT,
                           "window", window,
                           "visual", gdk_window_get_visual (window),
                           NULL);

diff --git a/gdk/wayland/gdkwaylandglcontext.h b/gdk/wayland/gdkwaylandglcontext.h
index d57d76b4893d8097e1b37dbbd2f79cb779ea7b7a..a2bb2c9f020c699d94a071d1b0f41397d5c45a63 100644 (file)
--- a/gdk/wayland/gdkwaylandglcontext.h
+++ b/gdk/wayland/gdkwaylandglcontext.h
@@ -30,9 +30,9 @@
 
 G_BEGIN_DECLS
 
-#define GDK_WAYLAND_TYPE_GL_CONTEXT            (gdk_wayland_gl_context_get_type ())
-#define GDK_WAYLAND_GL_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_WAYLAND_TYPE_GL_CONTEXT, GdkWaylandGLContext))
-#define GDK_WAYLAND_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_WAYLAND_TYPE_GL_CONTEXT))
+#define GDK_TYPE_WAYLAND_GL_CONTEXT            (gdk_wayland_gl_context_get_type ())
+#define GDK_WAYLAND_GL_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_WAYLAND_GL_CONTEXT, GdkWaylandGLContext))
+#define GDK_WAYLAND_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_WAYLAND_GL_CONTEXT))
 
 typedef struct _GdkWaylandGLContext            GdkWaylandGLContext;
 typedef struct _GdkWaylandGLContextClass       GdkWaylandGLContextClass;

diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 7811bcfdb353024b1ca37cd026b480fe55caa12a..3ddb05e0c4cb1dc1758f0c1d8c87d86f82aae7bf 100644 (file)
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -788,7 +788,7 @@ gdk_x11_window_create_gl_context (GdkWindow    *window,
                      glx_context,
                      is_direct ? "direct" : "indirect"));
 
-  context = g_object_new (GDK_X11_TYPE_GL_CONTEXT,
+  context = g_object_new (GDK_TYPE_X11_GL_CONTEXT,
                           "window", window,
                           "visual", gdk_visual,
                           NULL);

diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h
index 5fbf36fcf9190e76f5375246936e06699ceeb140..6d1d21a62657b65ed648974d4624a829f1fd74bc 100644 (file)
--- a/gdk/x11/gdkx11glcontext.h
+++ b/gdk/x11/gdkx11glcontext.h
@@ -29,9 +29,9 @@
 
 G_BEGIN_DECLS
 
-#define GDK_X11_TYPE_GL_CONTEXT                (gdk_x11_gl_context_get_type ())
-#define GDK_X11_GL_CONTEXT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_X11_TYPE_GL_CONTEXT, GdkX11GLContext))
-#define GDK_X11_IS_GL_CONTEXT(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_X11_TYPE_GL_CONTEXT))
+#define GDK_TYPE_X11_GL_CONTEXT                (gdk_x11_gl_context_get_type ())
+#define GDK_X11_GL_CONTEXT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_X11_GL_CONTEXT, GdkX11GLContext))
+#define GDK_X11_IS_GL_CONTEXT(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_X11_GL_CONTEXT))
 
 typedef struct _GdkX11GLContext                GdkX11GLContext;
 typedef struct _GdkX11GLContextClass   GdkX11GLContextClass;